Merge version 1:7.0.1-10+rpi1 and 1:7.0.1-12 to produce 1:7.0.1-12+rpi1

diff --cc debian/changelog
index 5bca537faef6d3ff891e4ee6cc316161bf5e725b,0f9e50ff170989d09019bcf9b6d44e19d451a4f9..da7897df1994622b156bf566638ccb411bfa2fd7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,45 -1,19 +1,62 @@@
- llvm-toolchain-7 (1:7.0.1-10+rpi1) bullseye-staging; urgency=medium
++llvm-toolchain-7 (1:7.0.1-12+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 14 May 2016 21:43:35 +0000]
 +  * Cleanup .pyc files in clean target.
 +  * Add a hack to the cmake based build to force armv6 (unfortunately the cmake
 +    based build relies on config.guess which assumes you want to build for the
 +    hardware you are running on).
 +  * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that
 +    are broken on lower arm architectures.
 +
 +  [changes introduced in llvm-toolchain-3.9 1:3.9.1-1 by Peter Michael Green]
 +  * disable testsuite (using a method that is hopefully less likely to cause diff conflicts than previously).
 +  * Remove -march=armv7-a in compiler-rt/cmake/config-ix-base.cmake
 +  * Clean up debian/usr in clean target.
 +  * Clean up clang/tools/*-3.9 in clean target.
 +  * Clean up stray *3.9.vim files
 +  * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc
 +  * Clean up debian/*.install
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-1+rpi1 by Peter michael green]
 +  * create build-llvm/docs/ocamldoc/html/ so the install target doesn't complain
 +    about it not existing.
 +  * clean up more crap left behind by build process.
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-3+rpi1 by Peter Michael Green]
 +  * Remove debian/man in clean target.
 +
 +  [changes introduced in llvm-toolchain-7 1:7-6+rpi1 by Peter Michael Green]
 +  * Use libatomic on armhf
 +  * Set cmake/config.guess.hack back to mode 644 in clean target to keep
 +    git/dgit happy.
 +  * Yet more clean target fixes.
 +
 +  [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green]
 +  * Change triplet in debian/rules to use armv6k rather than armv7l
 +
 +  [changes brought forward from 1:7.0.1-8+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 09 Jul 2019 19:04:39 +0000]
 +  * Make armv6k builds use vfpv2.
 +  * Add build-conflicts on libllvm-8-ocaml-dev
 +  * Further fixes to clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 01 Feb 2020 01:10:41 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 29 Mar 2020 11:23:20 +0000
++
+ llvm-toolchain-7 (1:7.0.1-12) unstable; urgency=medium
+ 
+   * debian/patches/947f9692440836dcb8d88b74b69dd379d85974ce.patch:
+     - usptream fix for new glibc 2.31
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 23 Mar 2020 11:59:35 +0100
+ 
+ llvm-toolchain-7 (1:7.0.1-11) unstable; urgency=medium
+ 
+   [ Gianfranco Costamagna ]
+   * Fix python lldb import, due to missing dependency on lldb-7 package
+ 
+   [ Sandro Tosi ]
+   * Drop -doc packages, in order to reduce rdeps of python-sphinx
+ 
+  -- Sandro Tosi <morph@debian.org>  Mon, 23 Mar 2020 00:21:01 -0400
  
  llvm-toolchain-7 (1:7.0.1-10) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index ae3e90fb54af656fbc2fd688464abfcc2f9cba92,dbca2ca726780870653d8f33a332a4cfbd61ca53..e286a4f08f448d9a2c86835f30f7d026949d3528
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -135,5 -162,4 +135,6 @@@ kfreebsd/lldb_source_Plugins_Process_Fr
  kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
  kfreebsd/include_llvm_MC_MCELFObjectWriter.h.diff
  ubuntu-eoan-distro.patch
+ 947f9692440836dcb8d88b74b69dd379d85974ce.patch
 +auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094
 +enable-vfpv2-for-armv6k

diff --cc debian/rules
Simple merge